From d117efb5c040898b9cedbc1122bca2edfa783fcc Mon Sep 17 00:00:00 2001
From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Fri, 19 Oct 2018 09:02:00 +0200
Subject: [PATCH] Replace qp intX to int64 functions since this is just as fast

---
 include/qpack/qpack.h      |   6 --
 include/siri/version.h     |   4 +-
 src/qpack/qpack.c          | 180 +++++++++++--------------------------
 src/siri/db/db.c           |   4 +-
 src/siri/db/groups.c       |   2 +-
 src/siri/db/listener.c     |  24 ++---
 src/siri/db/points.c       |   4 +-
 src/siri/db/props.c        |  24 ++---
 src/siri/db/query.c        |   2 +-
 src/siri/db/series.c       |  11 ++-
 src/siri/db/server.c       |   8 +-
 src/siri/db/servers.c      |  42 ++++-----
 src/siri/db/users.c        |   4 +-
 src/siri/service/account.c |   2 +-
 src/siri/service/client.c  |   8 +-
 src/siri/service/request.c |   4 +-
 16 files changed, 123 insertions(+), 206 deletions(-)

diff --git a/include/qpack/qpack.h b/include/qpack/qpack.h
index 60e5538e..2528a1be 100644
--- a/include/qpack/qpack.h
+++ b/include/qpack/qpack.h
@@ -174,9 +174,6 @@ int qp_add_string_term(qp_packer_t * packer, const char * str);
 
 int qp_add_raw_term(qp_packer_t * packer, const unsigned char * raw, size_t len);
 int qp_add_double(qp_packer_t * packer, double real);
-int qp_add_int8(qp_packer_t * packer, int8_t integer);
-int qp_add_int16(qp_packer_t * packer, int16_t integer);
-int qp_add_int32(qp_packer_t * packer, int32_t integer);
 int qp_add_int64(qp_packer_t * packer, int64_t integer);
 int qp_add_true(qp_packer_t * packer);
 int qp_add_false(qp_packer_t * packer);
@@ -189,9 +186,6 @@ int qp_add_fmt_safe(qp_packer_t * packer, const char * fmt, ...);
 int qp_fadd_type(qp_fpacker_t * fpacker, qp_types_t tp);
 int qp_fadd_raw(qp_fpacker_t * fpacker, const unsigned char * raw, size_t len);
 int qp_fadd_string(qp_fpacker_t * fpacker, const char * str);
-int qp_fadd_int8(qp_fpacker_t * fpacker, int8_t integer);
-int qp_fadd_int16(qp_fpacker_t * fpacker, int16_t integer);
-int qp_fadd_int32(qp_fpacker_t * fpacker, int32_t integer);
 int qp_fadd_int64(qp_fpacker_t * fpacker, int64_t integer);
 int qp_fadd_double(qp_fpacker_t * fpacker, double real);
 
diff --git a/include/siri/version.h b/include/siri/version.h
index 5d8bfa37..5f3f3fec 100644
--- a/include/siri/version.h
+++ b/include/siri/version.h
@@ -6,7 +6,7 @@
 
 #define SIRIDB_VERSION_MAJOR 2
 #define SIRIDB_VERSION_MINOR 0
-#define SIRIDB_VERSION_PATCH 30
+#define SIRIDB_VERSION_PATCH 31
 
 /*
  * Use SIRIDB_VERSION_PRE_RELEASE for alpha release versions.
@@ -15,7 +15,7 @@
  * Note that debian alpha packages should use versions like this:
  *   2.0.30-0alpha0
  */
-#define SIRIDB_VERSION_PRE_RELEASE ""
+#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0"
 
 #ifndef NDEBUG
 #define SIRIDB_VERSION_BUILD_RELEASE "+debug"
diff --git a/src/qpack/qpack.c b/src/qpack/qpack.c
index 1b42207b..8bade381 100644
--- a/src/qpack/qpack.c
+++ b/src/qpack/qpack.c
@@ -462,73 +462,12 @@ int qp_add_double(qp_packer_t * packer, double real)
     return 0;
 }
 
-#define QP_ADD_INT8(packer, integer) \
-{                                                               \
-    QP_RESIZE(2)                                                \
-    if (integer >= 0 && integer < 64)                           \
-    {                                                           \
-        packer->buffer[packer->len++] = integer;                \
-    }                                                           \
-    else if (integer >= -60 && integer < 0)                     \
-    {                                                           \
-        packer->buffer[packer->len++] = 63 - integer;           \
-    }                                                           \
-    else                                                        \
-    {                                                           \
-        packer->buffer[packer->len++] = QP_INT8;                \
-        packer->buffer[packer->len++] = integer;                \
-    }                                                           \
-    return 0;                                                   \
-}
-/*
- * Returns 0 if successful; -1 and a SIGNAL is raised in case an error occurred.
- */
-int qp_add_int8(qp_packer_t * packer, int8_t integer)
-    QP_ADD_INT8(packer, integer)
 
-#define QP_ADD_INT16(packer, integer)                                   \
-{                                                                       \
-    QP_RESIZE(3)                                                        \
-    packer->buffer[packer->len++] = QP_INT16;                           \
-    memcpy(packer->buffer + packer->len, &integer, sizeof(int16_t));    \
-    packer->len += sizeof(int16_t);                                     \
-    return 0;                                                           \
-}
-/*
- * Returns 0 if successful; -1 and a SIGNAL is raised in case an error occurred.
- */
-int qp_add_int16(qp_packer_t * packer, int16_t integer)
-{
-    int8_t i8;
-    if ((i8 = (int8_t) integer) == integer)
-        QP_ADD_INT8(packer, i8)
 
-    QP_ADD_INT16(packer, integer)
-}
 
-#define QP_ADD_INT32(packer, integer)                                   \
-{                                                                       \
-    QP_RESIZE(5)                                                        \
-    packer->buffer[packer->len++] = QP_INT32;                           \
-    memcpy(packer->buffer + packer->len, &integer, sizeof(int32_t));    \
-    packer->len += sizeof(int32_t);                                     \
-    return 0;                                                           \
-}
-/*
- * Returns 0 if successful; -1 and a SIGNAL is raised in case an error occurred.
- */
-int qp_add_int32(qp_packer_t * packer, int32_t integer)
-{
-    int8_t i8;
-    if ((i8 = (int8_t) integer) == integer)
-        QP_ADD_INT8(packer, i8)
 
-    int16_t i16;
-    if ((i16 = (int16_t) integer) == integer)
-        QP_ADD_INT16(packer, i16)
 
-    QP_ADD_INT32(packer, integer)
-}
+
 
 /*
  * Returns 0 if successful; -1 and a SIGNAL is raised in case an error occurred.
@@ -537,15 +476,43 @@ int qp_add_int64(qp_packer_t * packer, int64_t integer)
 {
     int8_t i8;
     if ((i8 = (int8_t) integer) == integer)
-        QP_ADD_INT8(packer, i8)
+    {
+        QP_RESIZE(2)
+        if (i8 >= 0 && i8 < 64)
+        {
+            packer->buffer[packer->len++] = i8;
+        }
+        else if (i8 >= -60 && i8 < 0)
+        {
+            packer->buffer[packer->len++] = 63 - i8;
+        }
+        else
+        {
+            packer->buffer[packer->len++] = QP_INT8;
+            packer->buffer[packer->len++] = i8;
+        }
+        return 0;
+    }
 
     int16_t i16;
     if ((i16 = (int16_t) integer) == integer)
-        QP_ADD_INT16(packer, i16)
+    {
+        QP_RESIZE(3)
+        packer->buffer[packer->len++] = QP_INT16;
+        memcpy(packer->buffer + packer->len, &i16, sizeof(int16_t));
+        packer->len += sizeof(int16_t);
+        return 0;
+    }
 
     int32_t i32;
     if ((i32 = (int32_t) integer) == integer)
-        QP_ADD_INT32(packer, i32)
+    {
+        QP_RESIZE(5)
+        packer->buffer[packer->len++] = QP_INT32;
+        memcpy(packer->buffer + packer->len, &i32, sizeof(int32_t));
+        packer->len += sizeof(int32_t);
+        return 0;
+    }
 
 
     QP_RESIZE(9)
@@ -645,65 +612,6 @@ int qp_fadd_string(qp_fpacker_t * fpacker, const char * str)
     return qp_fadd_raw(fpacker, (unsigned char *) str, strlen(str));
 }
 
-#define QP_FADD_INT8(fpacker, integer)                                      \
-{                                                                           \
-    if (integer >= 0 && integer < 64)                                       \
-    {                                                                       \
-        return (fputc(integer, fpacker) != EOF) ? 0 : EOF;                  \
-    }                                                                       \
-    if (integer >= -60 && integer < 0)                                      \
-    {                                                                       \
-        return (fputc(63 - integer, fpacker) != EOF) ? 0 : EOF;             \
-    }                                                                          \
-    return (fputc(QP_INT8, fpacker) != EOF && fputc(integer, fpacker) != EOF)  \
-            ? 0 : EOF;                                                         \
-}
-/*
- * Returns 0 if successful and EOF in case an error occurred.
- */
-int qp_fadd_int8(qp_fpacker_t * fpacker, int8_t integer)
-    QP_FADD_INT8(fpacker, integer)
-
-#define QP_FADD_INT16(fpacker, integer)                                     \
-{                                                                           \
-    return (fputc(QP_INT16, fpacker) != EOF &&                              \
-            fwrite(&integer, sizeof(int16_t), 1, fpacker) == 1) ? 0 : EOF;  \
-}
-
-/*
- * Returns 0 if successful and EOF in case an error occurred.
- */
-int qp_fadd_int16(qp_fpacker_t * fpacker, int16_t integer)
-{
-    int8_t i8;
-    if ((i8 = (int8_t) integer) == integer)
-        QP_FADD_INT8(fpacker, i8)
-
-    QP_FADD_INT16(fpacker, integer)
-}
-
-#define QP_FADD_INT32(fpacker, integer)                                     \
-{                                                                           \
-    return (fputc(QP_INT32, fpacker) != EOF &&                              \
-            fwrite(&integer, sizeof(int32_t), 1, fpacker) == 1) ? 0 : EOF;  \
-}
-
-/*
- * Returns 0 if successful and EOF in case an error occurred.
- */
-int qp_fadd_int32(qp_fpacker_t * fpacker, int32_t integer)
-{
-    int8_t i8;
-    if ((i8 = (int8_t) integer) == integer)
-        QP_FADD_INT8(fpacker, i8)
-
-    int16_t i16;
-    if ((i16 = (int16_t) integer) == integer)
-        QP_FADD_INT16(fpacker, i16)
-
-    QP_FADD_INT32(fpacker, integer)
-}
-
 /*
  * Returns 0 if successful and EOF in case an error occurred.
  */
@@ -711,15 +619,31 @@ int qp_fadd_int64(qp_fpacker_t * fpacker, int64_t integer)
 {
     int8_t i8;
     if ((i8 = (int8_t) integer) == integer)
-        QP_FADD_INT8(fpacker, i8)
-
+    {
+        if (i8 >= 0 && i8 < 64)
+        {
+            return (fputc(i8, fpacker) != EOF) ? 0 : EOF;
+        }
+        if (i8 >= -60 && i8 < 0)
+        {
+            return (fputc(63 - i8, fpacker) != EOF) ? 0 : EOF;
+        }
+        return (fputc(QP_INT8, fpacker) != EOF && fputc(i8, fpacker) != EOF)
+                ? 0 : EOF;
+    }
     int16_t i16;
     if ((i16 = (int16_t) integer) == integer)
-        QP_FADD_INT16(fpacker, i16)
+    {
+        return (fputc(QP_INT16, fpacker) != EOF &&
+                fwrite(&i16, sizeof(int16_t), 1, fpacker) == 1) ? 0 : EOF;
+    }
 
     int32_t i32;
     if ((i32 = (int32_t) integer) == integer)
-        QP_FADD_INT32(fpacker, i32)
+    {
+        return (fputc(QP_INT32, fpacker) != EOF &&
+                fwrite(&i32, sizeof(int32_t), 1, fpacker) == 1) ? 0 : EOF;
+    }
 
     return (fputc(QP_INT64, fpacker) != EOF &&
             fwrite(&integer, sizeof(int64_t), 1, fpacker) == 1) ? 0 : EOF;
diff --git a/src/siri/db/db.c b/src/siri/db/db.c
index deaebb06..7c6f329c 100644
--- a/src/siri/db/db.c
+++ b/src/siri/db/db.c
@@ -542,10 +542,10 @@ int siridb_save(siridb_t * siridb)
     }
 
     return (qp_fadd_type(fpacker, QP_ARRAY_OPEN) ||
-            qp_fadd_int8(fpacker, SIRIDB_SCHEMA) ||
+            qp_fadd_int64(fpacker, SIRIDB_SCHEMA) ||
             qp_fadd_raw(fpacker, (const unsigned char *) siridb->uuid, 16) ||
             qp_fadd_string(fpacker, siridb->dbname) ||
-            qp_fadd_int8(fpacker, siridb->time->precision) ||
+            qp_fadd_int64(fpacker, siridb->time->precision) ||
             qp_fadd_int64(fpacker, siridb->buffer->size) ||
             qp_fadd_int64(fpacker, siridb->duration_num) ||
             qp_fadd_int64(fpacker, siridb->duration_log) ||
diff --git a/src/siri/db/groups.c b/src/siri/db/groups.c
index 1a9ad0f8..cc2916c8 100644
--- a/src/siri/db/groups.c
+++ b/src/siri/db/groups.c
@@ -238,7 +238,7 @@ int siridb_groups_save(siridb_groups_t * groups)
         qp_fadd_type(fpacker, QP_ARRAY_OPEN) ||
 
         /* write the current schema */
-        qp_fadd_int16(fpacker, SIRIDB_GROUPS_SCHEMA) ||
+        qp_fadd_int64(fpacker, SIRIDB_GROUPS_SCHEMA) ||
 
         /* we can and should skip this if we have no users to save */
         ct_values(groups->groups, (ct_val_cb) GROUPS_write, fpacker) ||
diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c
index b3aacaeb..70ab542b 100644
--- a/src/siri/db/listener.c
+++ b/src/siri/db/listener.c
@@ -2849,13 +2849,13 @@ static void exit_list_pools(uv_async_t * handle)
             switch(*((uint32_t *) q_list->props->data[prop]))
             {
             case CLERI_GID_K_POOL:
-                qp_add_int16(query->packer, wpool.pool);
+                qp_add_int64(query->packer, (int64_t) wpool.pool);
                 break;
             case CLERI_GID_K_SERVERS:
-                qp_add_int16(query->packer, wpool.servers);
+                qp_add_int64(query->packer, (int64_t) wpool.servers);
                 break;
             case CLERI_GID_K_SERIES:
-                qp_add_int64(query->packer, wpool.series);
+                qp_add_int64(query->packer, (int64_t) wpool.series);
                 break;
             }
         }
@@ -3094,19 +3094,19 @@ static void exit_list_shards(uv_async_t * handle)
                 switch(*((uint32_t *) q_list->props->data[prop]))
                 {
                 case CLERI_GID_K_SID:
-                    qp_add_int64(query->packer, vshard.shard->id);
+                    qp_add_int64(query->packer, (int64_t) vshard.shard->id);
                     break;
                 case CLERI_GID_K_POOL:
-                    qp_add_int16(query->packer, vshard.server->pool);
+                    qp_add_int64(query->packer, (int64_t) vshard.server->pool);
                     break;
                 case CLERI_GID_K_SIZE:
-                    qp_add_int64(query->packer, vshard.shard->len);
+                    qp_add_int64(query->packer, (int64_t) vshard.shard->len);
                     break;
                 case CLERI_GID_K_START:
-                    qp_add_int64(query->packer, vshard.start);
+                    qp_add_int64(query->packer, (int64_t) vshard.start);
                     break;
                 case CLERI_GID_K_END:
-                    qp_add_int64(query->packer, vshard.end);
+                    qp_add_int64(query->packer, (int64_t) vshard.end);
                     break;
                 case CLERI_GID_K_TYPE:
                     qp_add_string(
@@ -4506,19 +4506,19 @@ static void async_list_series(uv_async_t * handle)
                             series->name_len);
                     break;
                 case CLERI_GID_K_LENGTH:
-                    qp_add_int32(query->packer, series->length);
+                    qp_add_int64(query->packer, (int64_t) series->length);
                     break;
                 case CLERI_GID_K_TYPE:
                     qp_add_string(query->packer, series_type_map[series->tp]);
                     break;
                 case CLERI_GID_K_POOL:
-                    qp_add_int16(query->packer, series->pool);
+                    qp_add_int64(query->packer, (int64_t) series->pool);
                     break;
                 case CLERI_GID_K_START:
-                    qp_add_int64(query->packer, series->start);
+                    qp_add_int64(query->packer, (int64_t) series->start);
                     break;
                 case CLERI_GID_K_END:
-                    qp_add_int64(query->packer, series->end);
+                    qp_add_int64(query->packer, (int64_t) series->end);
                     break;
                 }
             }
diff --git a/src/siri/db/points.c b/src/siri/db/points.c
index 682e6d32..8c0de8eb 100644
--- a/src/siri/db/points.c
+++ b/src/siri/db/points.c
@@ -263,8 +263,8 @@ int siridb_points_raw_pack(siridb_points_t * points, qp_packer_t * packer)
     }
 
     rc = -(qp_add_type(packer, QP_ARRAY_OPEN) ||
-            qp_add_int8(packer, points->tp) ||
-            qp_add_int32(packer, points->len) ||
+            qp_add_int64(packer, (int64_t) points->tp) ||
+            qp_add_int64(packer, (int64_t) points->len) ||
             qp_add_raw(packer, data, size) ||
             qp_add_type(packer, QP_ARRAY_CLOSE));
 
diff --git a/src/siri/db/props.c b/src/siri/db/props.c
index 8ee3726b..596a3e13 100644
--- a/src/siri/db/props.c
+++ b/src/siri/db/props.c
@@ -251,7 +251,7 @@ static void prop_active_handles(
         int map)
 {
     SIRIDB_PROP_MAP("active_handles", 14)
-    qp_add_int32(packer, (int32_t) siri.loop->active_handles);
+    qp_add_int64(packer, (int64_t) siri.loop->active_handles);
 }
 
 static void prop_active_tasks(
@@ -260,7 +260,7 @@ static void prop_active_tasks(
         int map)
 {
     SIRIDB_PROP_MAP("active_tasks", 12)
-    qp_add_int32(packer, (int32_t) siridb->tasks.active);
+    qp_add_int64(packer, (int64_t) siridb->tasks.active);
 }
 
 static void prop_buffer_path(
@@ -278,7 +278,7 @@ static void prop_buffer_size(
         int map)
 {
     SIRIDB_PROP_MAP("buffer_size", 11)
-    qp_add_int32(packer, (int32_t) siridb->buffer->size);
+    qp_add_int64(packer, (int64_t) siridb->buffer->size);
 }
 
 static void prop_dbname(
@@ -332,7 +332,7 @@ static void prop_fifo_files(
         int map)
 {
     SIRIDB_PROP_MAP("fifo_files", 10)
-    qp_add_int32(packer, (int32_t) siridb_fifo_size(siridb->fifo));
+    qp_add_int64(packer, (int64_t) siridb_fifo_size(siridb->fifo));
 }
 
 static void prop_idle_percentage(
@@ -341,7 +341,7 @@ static void prop_idle_percentage(
         int map)
 {
     SIRIDB_PROP_MAP("idle_percentage", 15)
-    qp_add_int8(packer, siridb_get_idle_percentage(siridb));
+    qp_add_int64(packer, siridb_get_idle_percentage(siridb));
 }
 
 static void prop_idle_time(
@@ -350,7 +350,7 @@ static void prop_idle_time(
         int map)
 {
     SIRIDB_PROP_MAP("idle_time", 9)
-    qp_add_int32(packer, (int32_t) siridb->tasks.idle_time);
+    qp_add_int64(packer, (int64_t) siridb->tasks.idle_time);
 }
 
 static void prop_ip_support(
@@ -395,7 +395,7 @@ static void prop_max_open_files(
         int map)
 {
     SIRIDB_PROP_MAP("max_open_files", 14)
-    qp_add_int32(packer, (int32_t) siri.cfg->max_open_files);
+    qp_add_int64(packer, (int64_t) siri.cfg->max_open_files);
 }
 
 static void prop_mem_usage(
@@ -404,7 +404,7 @@ static void prop_mem_usage(
         int map)
 {
     SIRIDB_PROP_MAP("mem_usage", 9)
-    qp_add_int32(packer, (int32_t) (procinfo_total_physical_memory() / 1024));
+    qp_add_int64(packer, (int64_t) (procinfo_total_physical_memory() / 1024));
 }
 
 static void prop_open_files(
@@ -413,7 +413,7 @@ static void prop_open_files(
         int map)
 {
     SIRIDB_PROP_MAP("open_files", 10)
-    qp_add_int32(packer, (int32_t) siridb_open_files(siridb));
+    qp_add_int64(packer, (int64_t) siridb_open_files(siridb));
 }
 
 static void prop_pool(
@@ -422,7 +422,7 @@ static void prop_pool(
         int map)
 {
     SIRIDB_PROP_MAP("pool", 4)
-    qp_add_int16(packer, (int16_t) siridb->server->pool);
+    qp_add_int64(packer, (int64_t) siridb->server->pool);
 }
 
 static void prop_received_points(
@@ -476,7 +476,7 @@ static void prop_startup_time(
         int map)
 {
     SIRIDB_PROP_MAP("startup_time", 12)
-    qp_add_int32(packer, (int32_t) siri.startup_time);
+    qp_add_int64(packer, (int64_t) siri.startup_time);
 }
 
 static void prop_status(
@@ -527,7 +527,7 @@ static void prop_uptime(
         int map)
 {
     SIRIDB_PROP_MAP("uptime", 6)
-    qp_add_int32(packer, siridb_get_uptime(siridb));
+    qp_add_int64(packer, siridb_get_uptime(siridb));
 }
 
 static void prop_uuid(
diff --git a/src/siri/db/query.c b/src/siri/db/query.c
index e0bb546c..6526b918 100644
--- a/src/siri/db/query.c
+++ b/src/siri/db/query.c
@@ -253,7 +253,7 @@ void siridb_query_forward(
 
     /* add the query to the packer */
     QUERY_to_packer(packer, query);
-    qp_add_int8(packer, SIRIDB_TIME_DEFAULT);  /* Only for version < 2.0.24 */
+    qp_add_int64(packer, SIRIDB_TIME_DEFAULT);  /* Only for version < 2.0.24 */
 
 
     sirinet_pkg_t * pkg = sirinet_pkg_new(0, packer->len, 0, packer->buffer);
diff --git a/src/siri/db/series.c b/src/siri/db/series.c
index 8d85ff73..613645eb 100644
--- a/src/siri/db/series.c
+++ b/src/siri/db/series.c
@@ -35,7 +35,6 @@
 #define SIRIDB_DROPPED_FN ".dropped"
 #define SIRIDB_MAX_SERIES_ID_FN ".max_series_id"
 #define SIRIDB_SERIES_SCHEMA 1
-#define BEND series->buffer->points->data[series->buffer->points->len - 1].ts
 #define DROPPED_DUMMY 1
 
 /*
@@ -275,8 +274,8 @@ siridb_series_t * siridb_series_new(
                 siridb->store,
                 (const unsigned char *) series_name,
                 series->name_len + 1) ||
-        qp_fadd_int32(siridb->store, (int32_t) series->id) ||
-        qp_fadd_int8(siridb->store, (int8_t) series->tp) ||
+        qp_fadd_int64(siridb->store, (int64_t) series->id) ||
+        qp_fadd_int64(siridb->store, (int64_t) series->tp) ||
         qp_flush(siridb->store))
     {
         ERR_FILE
@@ -1388,8 +1387,8 @@ static inline int SERIES_pack(siridb_series_t * series, qp_fpacker_t * fpacker)
                     fpacker,
                     (unsigned char *) series->name,
                     series->name_len + 1) ||
-            qp_fadd_int32(fpacker, (int32_t) series->id) ||
-            qp_fadd_int8(fpacker, (int8_t) series->tp));
+            qp_fadd_int64(fpacker, (int64_t) series->id) ||
+            qp_fadd_int64(fpacker, (int64_t) series->tp));
 }
 
 /*
@@ -1417,7 +1416,7 @@ static int SERIES_save(siridb_t * siridb)
         qp_fadd_type(fpacker, QP_ARRAY_OPEN) ||
 
         /* write the current schema */
-        qp_fadd_int16(fpacker, SIRIDB_SERIES_SCHEMA))
+        qp_fadd_int64(fpacker, SIRIDB_SERIES_SCHEMA))
     {
         ERR_FILE
     }
diff --git a/src/siri/db/server.c b/src/siri/db/server.c
index 6648d3da..8272072d 100644
--- a/src/siri/db/server.c
+++ b/src/siri/db/server.c
@@ -689,17 +689,17 @@ static void SERVER_on_connect(uv_connect_t * req, int status)
                 qp_add_raw(packer, (const unsigned char *)
                         client->siridb->server->uuid, 16) ||
                 qp_add_string_term(packer, siridb->dbname) ||
-                qp_add_int16(packer, siridb->server->flags) ||
+                qp_add_int64(packer, siridb->server->flags) ||
                 qp_add_string_term(packer, SIRIDB_VERSION) ||
                 qp_add_string_term(packer, SIRIDB_MINIMAL_VERSION) ||
-                qp_add_int8(packer, siri.cfg->ip_support) ||
+                qp_add_int64(packer, (int64_t) siri.cfg->ip_support) ||
                 qp_add_string_term(packer, uv_version_string()) ||
                 qp_add_string_term(packer, siridb->dbpath) ||
                 qp_add_string_term(packer, siridb->buffer->path) ||
                 qp_add_int64(packer, (int64_t) siridb->buffer->size) ||
-                qp_add_int32(packer, (int32_t) siri.startup_time) ||
+                qp_add_int64(packer, (int64_t) siri.startup_time) ||
                 qp_add_string_term(packer, siridb->server->address) ||
-                qp_add_int32(packer, (int32_t) siridb->server->port))
+                qp_add_int64(packer, (int64_t) siridb->server->port))
             {
                 qp_packer_free(packer);
             }
diff --git a/src/siri/db/servers.c b/src/siri/db/servers.c
index 8dcfdd57..065d6dc7 100644
--- a/src/siri/db/servers.c
+++ b/src/siri/db/servers.c
@@ -606,13 +606,13 @@ int siridb_servers_list(siridb_server_t * server, uv_async_t * handle)
                             QP_TRUE : QP_FALSE);
             break;
         case CLERI_GID_K_POOL:
-            qp_add_int16(query->packer, server->pool);
+            qp_add_int64(query->packer, (int64_t) server->pool);
             break;
         case CLERI_GID_K_PORT:
-            qp_add_int32(query->packer, server->port);
+            qp_add_int64(query->packer, (int64_t) server->port);
             break;
         case CLERI_GID_K_STARTUP_TIME:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
                     (siridb->server == server) ?
                             siri.startup_time : server->startup_time);
@@ -645,45 +645,45 @@ int siridb_servers_list(siridb_server_t * server, uv_async_t * handle)
          * that specific server.
          */
         case CLERI_GID_K_ACTIVE_HANDLES:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
-                    (int32_t) siri.loop->active_handles);
+                    (int64_t) siri.loop->active_handles);
             break;
         case CLERI_GID_K_ACTIVE_TASKS:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
-                    (int32_t) siridb->tasks.active);
+                    (int64_t) siridb->tasks.active);
             break;
         case CLERI_GID_K_IDLE_PERCENTAGE:
-            qp_add_int8(
+            qp_add_int64(
                     query->packer,
                     siridb_get_idle_percentage(siridb));
             break;
         case CLERI_GID_K_IDLE_TIME:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
-                    (int32_t) siridb->tasks.idle_time);
+                    (int64_t) siridb->tasks.idle_time);
             break;
         case CLERI_GID_K_LOG_LEVEL:
             qp_add_string(query->packer, Logger.level_name);
             break;
         case CLERI_GID_K_MAX_OPEN_FILES:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
-                    (int32_t) siri.cfg->max_open_files);
+                    (int64_t) siri.cfg->max_open_files);
             break;
         case CLERI_GID_K_MEM_USAGE:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
-                    (int32_t) (procinfo_total_physical_memory() / 1024));
+                    (int64_t) (procinfo_total_physical_memory() / 1024));
             break;
         case CLERI_GID_K_FIFO_FILES:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
-                    (int32_t) siridb_fifo_size(siridb->fifo));
+                    (int64_t) siridb_fifo_size(siridb->fifo));
             break;
         case CLERI_GID_K_OPEN_FILES:
-            qp_add_int32(query->packer, siridb_open_files(siridb));
+            qp_add_int64(query->packer, siridb_open_files(siridb));
             break;
         case CLERI_GID_K_RECEIVED_POINTS:
             qp_add_int64(query->packer, siridb->received_points);
@@ -698,7 +698,7 @@ int siridb_servers_list(siridb_server_t * server, uv_async_t * handle)
             qp_add_string(query->packer, siridb_initsync_sync_progress(siridb));
             break;
         case CLERI_GID_K_UPTIME:
-            qp_add_int32(
+            qp_add_int64(
                     query->packer,
                     siridb_get_uptime(siridb));
             break;
@@ -758,7 +758,7 @@ int siridb_servers_save(siridb_t * siridb)
         qp_fadd_type(fpacker, QP_ARRAY_OPEN) ||
 
         /* write the current schema */
-        qp_fadd_int16(fpacker, SIRIDB_SERVERS_SCHEMA))
+        qp_fadd_int64(fpacker, SIRIDB_SERVERS_SCHEMA))
     {
         ERR_FILE
         qp_close(fpacker);
@@ -795,8 +795,8 @@ static int SERVERS_walk_save(siridb_server_t * server, qp_fpacker_t * fpacker)
     rc += qp_fadd_type(fpacker, QP_ARRAY4);
     rc += qp_fadd_raw(fpacker, (unsigned char *) &server->uuid[0], 16);
     rc += qp_fadd_string(fpacker, server->address);
-    rc += qp_fadd_int32(fpacker, (int32_t) server->port);
-    rc += qp_fadd_int32(fpacker, (int32_t) server->pool);
+    rc += qp_fadd_int64(fpacker, (int64_t) server->port);
+    rc += qp_fadd_int64(fpacker, (int64_t) server->pool);
     return rc;
 }
 
diff --git a/src/siri/db/users.c b/src/siri/db/users.c
index f0a8f40d..8a8d663e 100644
--- a/src/siri/db/users.c
+++ b/src/siri/db/users.c
@@ -306,7 +306,7 @@ int siridb_users_save(siridb_t * siridb)
         qp_fadd_type(fpacker, QP_ARRAY_OPEN) ||
 
         /* write the current schema */
-        qp_fadd_int16(fpacker, SIRIDB_USERS_SCHEMA) ||
+        qp_fadd_int64(fpacker, SIRIDB_USERS_SCHEMA) ||
 
         /* we can and should skip this if we have no users to save */
         llist_walk(siridb->users, (llist_cb) USERS_save, fpacker) ||
@@ -331,7 +331,7 @@ static int USERS_save(siridb_user_t * user, qp_fpacker_t * fpacker)
     rc += qp_fadd_type(fpacker, QP_ARRAY3);
     rc += qp_fadd_string(fpacker, user->name);
     rc += qp_fadd_string(fpacker, user->password);
-    rc += qp_fadd_int32(fpacker, (int32_t) user->access_bit);
+    rc += qp_fadd_int64(fpacker, (int64_t) user->access_bit);
     return rc;
 }
 
diff --git a/src/siri/service/account.c b/src/siri/service/account.c
index 67e6a9c1..fa765273 100644
--- a/src/siri/service/account.c
+++ b/src/siri/service/account.c
@@ -355,7 +355,7 @@ int siri_service_account_save(siri_t * siri, char * err_msg)
         qp_fadd_type(fpacker, QP_ARRAY_OPEN) ||
 
         /* write the current schema */
-        qp_fadd_int16(fpacker, SIRI_SERVICE_ACCOUNT_SCHEMA) ||
+        qp_fadd_int64(fpacker, SIRI_SERVICE_ACCOUNT_SCHEMA) ||
 
         /* we can and should skip this if we have no accounts to save */
         llist_walk(siri->accounts, (llist_cb) ACCOUNT_save, fpacker) ||
diff --git a/src/siri/service/client.c b/src/siri/service/client.c
index ffbace26..127346cd 100644
--- a/src/siri/service/client.c
+++ b/src/siri/service/client.c
@@ -689,8 +689,8 @@ static void CLIENT_on_file_database(
     if (qp_add_type(packer, QP_ARRAY4) ||
         qp_add_raw(packer, (const unsigned char *) &adm_client->uuid, 16) ||
         qp_add_string(packer, siri.cfg->server_address) ||
-        qp_add_int32(packer, (int32_t) siri.cfg->listen_backend_port) ||
-        qp_add_int32(packer, (int32_t) adm_client->pool))
+        qp_add_int64(packer, (int64_t) siri.cfg->listen_backend_port) ||
+        qp_add_int64(packer, (int64_t) adm_client->pool))
     {
         qp_packer_free(packer);
         CLIENT_err(adm_client, "memory allocation error");
@@ -763,8 +763,8 @@ static void CLIENT_on_file_servers(
     rc += qp_fadd_type(fp, QP_ARRAY4);
     rc += qp_fadd_raw(fp, (const unsigned char *) &adm_client->uuid, 16);
     rc += qp_fadd_string(fp, siri.cfg->server_address);
-    rc += qp_fadd_int32(fp, (int32_t) siri.cfg->listen_backend_port);
-    rc += qp_fadd_int32(fp, (int32_t) adm_client->pool);
+    rc += qp_fadd_int64(fp, (int64_t) siri.cfg->listen_backend_port);
+    rc += qp_fadd_int64(fp, (int64_t) adm_client->pool);
     rc += fclose(fp);
 
     if (rc)
diff --git a/src/siri/service/request.c b/src/siri/service/request.c
index d4391bfd..1207f353 100644
--- a/src/siri/service/request.c
+++ b/src/siri/service/request.c
@@ -611,10 +611,10 @@ static cproto_server_t SERVICE_on_new_database(
     uuid_generate(uuid);
 
     if (qp_fadd_type(fp, QP_ARRAY_OPEN) ||
-        qp_fadd_int8(fp, SIRIDB_SCHEMA) ||
+        qp_fadd_int64(fp, SIRIDB_SCHEMA) ||
         qp_fadd_raw(fp, (const unsigned char *) uuid, 16) ||
         qp_fadd_raw(fp, qp_dbname.via.raw, qp_dbname.len) ||
-        qp_fadd_int8(fp, time_precision) ||
+        qp_fadd_int64(fp, time_precision) ||
         qp_fadd_int64(fp, buffer_size) ||
         qp_fadd_int64(fp, duration_num) ||
         qp_fadd_int64(fp, duration_log) ||
-- 
2.30.2